Merge changes from emacs-23 branch.
authorChong Yidong <cyd@stupidchicken.com>
Sun, 8 Aug 2010 21:15:44 +0000 (17:15 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Sun, 8 Aug 2010 21:15:44 +0000 (17:15 -0400)
commitc72d18104db5182ea512e8aa129315352a0510c8
tree3a18e72b8d6baa42d6d1d27ba85c0a30603a5f34
parentb5f1d081503201b9588df31e54d0c7c2183d9243
parentebfbe940bd4febbec6dc46cb3a3dc2819e1a228e
Merge changes from emacs-23 branch.
src/ChangeLog
src/charset.c
src/coding.c
src/xfns.c